merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 04:25:06 +0000 (13:25 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 04:25:06 +0000 (13:25 +0900)

Trivial merge